merge with xen-unstable.hg

diff --cc xen/arch/ia64/xen/mm.c
Simple merge

diff --cc xen/include/public/foreign/reference.size
index 3fab4d9663f1233568b890554e5de90379ccc67a,f2d2eee805be7506c260bee7d5399670d04b9b3f..70ddca9ac2e13c6323369656e373687ff1ef53ec
--- 1/xen/include/public/foreign/reference.size
--- 2/xen/include/public/foreign/reference.size
+++ b/xen/include/public/foreign/reference.size
@@@ -1,17 -1,17 +1,17 @@@
  
- structs              |  x86_32  x86_64    ia64
+ structs                   |  x86_32  x86_64    ia64
  
- start_info           |    1104    1152    1152
- trap_info            |       8      16       -
- pt_fpreg             |       -       -      16
- cpu_user_regs        |      68     200     496
- xen_ia64_boot_param  |       -       -      96
- ia64_tr_entry        |       -       -      32
- vcpu_extra_regs      |       -       -       -
- vcpu_guest_context   |    2800    5168   21904
- arch_vcpu_info       |      24      16       0
- vcpu_time_info       |      32      32      32
- vcpu_info            |      64      64      48
- arch_shared_info     |     268     280     272
- shared_info          |    2584    3368    4384
+ start_info                |    1104    1152    1152
+ trap_info                 |       8      16       -
+ pt_fpreg                  |       -       -      16
+ cpu_user_regs             |      68     200     496
+ xen_ia64_boot_param       |       -       -      96
+ ia64_tr_entry             |       -       -      32
 -vcpu_extra_regs           |       -       -     536
 -vcpu_guest_context        |    2800    5168    1056
++vcpu_extra_regs           |       -       -       -
++vcpu_guest_context        |    2800    5168   21904
+ arch_vcpu_info            |      24      16       0
+ vcpu_time_info            |      32      32      32
+ vcpu_info                 |      64      64      48
+ arch_shared_info          |     268     280     272
+ shared_info               |    2584    3368    4384